Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase spring v.0.4.12 #8

Merged
merged 21 commits into from
Apr 15, 2024
Merged

Rebase spring v.0.4.12 #8

merged 21 commits into from
Apr 15, 2024

Conversation

oodamien
Copy link
Collaborator

@oodamien oodamien commented Apr 8, 2024

Resolves #7

@shakuzen
Copy link
Member

It looks like there are some conflicts. Perhaps from merging #6?

philwebb and others added 19 commits April 15, 2024 09:01
Use a consistent color for both links and regular text and provide
a little more margin from for the header.
See #210
Anonymise projects
Update asciidoc test page
Resoles #220
Resolves #194
Add a new 'redirect' layout that can be used to as a target of an Apache HTTPD rewrite rule in order to perform redirects based on a page or anchor.
Closes #221
# Conflicts:
#	preview-src/index.adoc.yml
#	src/css/vars.css
#	src/partials/header-content.hbs
Removes duplicated templates and replaces references to Spring with Micrometer. Fixes the logo at the top of the page when in light mode. The link for the logo was also mistakenly https://spring.io rather than https://micrometer.io.
# Conflicts:
#	src/partials/footer-content.hbs
Removes duplicated templates and replaces references to Spring with Micrometer. Fixes the logo at the top of the page when in light mode. The link for the logo was also mistakenly https://spring.io rather than https://micrometer.io.
src/partials/version.hbs Outdated Show resolved Hide resolved
@oodamien oodamien requested a review from shakuzen April 15, 2024 07:36
Copy link
Member

@shakuzen shakuzen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I think.

@oodamien oodamien merged commit 570ce9c into main Apr 15, 2024
1 check passed
@jonatan-ivanov jonatan-ivanov deleted the rebase-spring-2 branch April 15, 2024 23:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Report last changes v.0.4.12
5 participants